From: Ian.Campbell@xensource.com Date: Fri, 27 Jan 2006 14:24:50 +0000 (+0000) Subject: Checkin missing hunks from previous commit X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16520^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=da322cd0ddfd79757f19f29911c15b36f365fe4a;p=xen.git Checkin missing hunks from previous commit Signed-off-by: Ian Campbell --- diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c index f2669a71a3..a9aa782e01 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c @@ -995,7 +995,7 @@ void __init trap_init(void) * default LDT is a single-entry callgate to lcall7 for iBCS * and a callgate to lcall27 for Solaris/x86 binaries */ - make_lowmem_page_readonly(&default_ldt[0]); + make_lowmem_mmu_page_readonly(&default_ldt[0]); /* * Should be a barrier for any external CPU state. diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile index c77d504f3d..f08ee48501 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile +++ b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile @@ -11,7 +11,7 @@ $(obj)/vmlinux.lds.S: extra-y += vmlinux.lds -obj-y := evtchn.o reboot.o gnttab.o +obj-y := evtchn.o reboot.o gnttab.o features.o obj-$(CONFIG_PROC_FS) += xen_proc.o obj-$(CONFIG_NET) += skbuff.o